Fix Xen 'make install' not to rebuild console.o if called

from sudo environemnt, for example.

diff --git a/xen/Makefile b/xen/Makefile
index a97db442170c0e672e5c8304fc78c6874f954d4a..f45d3df74b7533b81b36a4b9b6d16d3f6823279d 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -67,9 +67,12 @@ endif
        $(MAKE) -C arch/$(TARGET_ARCH)
 
 # drivers/char/console.o contains static banner/compile info. Blow it away.
+# Don't refresh these files during e.g., 'sudo make install'
 delete-unfresh-files:
-       rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
-       $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
+       @if [ ! -r include/xen/compile.h -o -O include/xen/compile.h ]; then \
+               rm -f include/xen/{banner,compile}.h; \
+               $(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files; \
+       fi
 
 # acm_policy.h contains security policy for Xen
 include/xen/acm_policy.h:

diff --git a/xen/drivers/char/Makefile b/xen/drivers/char/Makefile
index 957a4bc5a2d595de773135a8bbf783aab567a2c8..10f907a477e15eb8ab27bd36eca08c5b6827f3ef 100644 (file)
--- a/xen/drivers/char/Makefile
+++ b/xen/drivers/char/Makefile
@@ -7,3 +7,5 @@ driver.o: $(OBJS)
 
 clean:
        rm -f *.o *~ core
+
+console.o: $(BASEDIR)/include/xen/compile.h